[NEW] Add tags to uploaded images using Google Cloud Vision API #6301
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
That's neat, will those tags be searchable? |
|
Yes that's in our plans. |
# Conflicts: # packages/rocketchat-lib/lib/callbacks.coffee
|
@RocketChat/core conflicts have been solved. Can I have some eyes on this? |
sampaiodiego
changed the title
# Conflicts: # .meteor/versions # packages/rocketchat-lib/server/functions/sendMessage.coffee # packages/rocketchat-lib/server/functions/settings.coffee
sampaiodiego
previously requested changes
Jul 22, 2017
| const file = RocketChat.models.Uploads.findOne({ _id: message.file._id }); | ||
| if (file && file.type && file.type.indexOf('image') !== -1 && file.store === 'GoogleCloudStorage:Uploads' && file.googleCloudStorage) { | ||
| if (this.incCallCount(1)) { | ||
| const bucket = this.storageClient.bucket(file.googleCloudStorage.bucket); |
There was a problem hiding this comment.
we don't store bucket name on the file anymore.
| if (file && file.type && file.type.indexOf('image') !== -1 && file.store === 'GoogleCloudStorage:Uploads' && file.googleCloudStorage) { | ||
| if (this.incCallCount(1)) { | ||
| const bucket = this.storageClient.bucket(file.googleCloudStorage.bucket); | ||
| const bucketFile = bucket.file(`${ file.googleCloudStorage.path }${ file._id }`); |
There was a problem hiding this comment.
the file path property changed as well
| blockUnsafeImages(message) { | ||
| if (this.enabled && this.serviceAccount && message && message.file && message.file._id) { | ||
| const file = RocketChat.models.Uploads.findOne({ _id: message.file._id }); | ||
| if (file && file.type && file.type.indexOf('image') !== -1 && file.store === 'GoogleCloudStorage:Uploads' && file.googleCloudStorage) { |
There was a problem hiding this comment.
we don't have the file.googleCloudStorage property anymore.
# Conflicts: # packages/rocketchat-lib/server/functions/sendMessage.js # packages/rocketchat-theme/client/imports/general/base_old.css
rodrigok
approved these changes
Aug 21, 2017
|
@marceloschmidt Can you test it again? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@RocketChat/core
Closes #6019